projects / gpsbabel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: fbba3dd)
Various UI improvements
authorjfatherton <jfatherton@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Fri, 6 Feb 2004 03:30:49 +0000 (03:30 +0000)
committerjfatherton <jfatherton@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Fri, 6 Feb 2004 03:30:49 +0000 (03:30 +0000)
gpsbabel/macgpsbabel/English.lproj/MainMenu.nib/info.nib patch | blob | history
gpsbabel/macgpsbabel/English.lproj/MainMenu.nib/objects.nib patch | blob | history
gpsbabel/macgpsbabel/MacGPSBabel.applescript patch | blob | history
gpsbabel/macgpsbabel/MacGPSBabel.pbproj/jeremya.pbxuser patch | blob | history

diff --git a/gpsbabel/macgpsbabel/English.lproj/MainMenu.nib/info.nib b/gpsbabel/macgpsbabel/English.lproj/MainMenu.nib/info.nib
index bfc648b67ef4e09138435449a9b4eb76e21b2444..a16140d812f08e34332ad9d6055faf4599b60742 100644 (file)
--- a/gpsbabel/macgpsbabel/English.lproj/MainMenu.nib/info.nib
+++ b/gpsbabel/macgpsbabel/English.lproj/MainMenu.nib/info.nib
@@ -11,10 +11,10 @@
        <string>283.0</string>
        <key>IBOpenObjects</key>
        <array>
-               <integer>21</integer>
-               <integer>229</integer>
                <integer>29</integer>
+               <integer>21</integer>
                <integer>305</integer>
+               <integer>229</integer>
        </array>
        <key>IBSystem Version</key>
        <string>6R73</string>
diff --git a/gpsbabel/macgpsbabel/English.lproj/MainMenu.nib/objects.nib b/gpsbabel/macgpsbabel/English.lproj/MainMenu.nib/objects.nib
index 7ced0413a4e1ad290131c4dfeb34fa0b3875f9de..ad77101fd0650e9cbeae31e28665ef51a9293583 100644 (file)
Binary files a/gpsbabel/macgpsbabel/English.lproj/MainMenu.nib/objects.nib and b/gpsbabel/macgpsbabel/English.lproj/MainMenu.nib/objects.nib differ
diff --git a/gpsbabel/macgpsbabel/MacGPSBabel.applescript b/gpsbabel/macgpsbabel/MacGPSBabel.applescript
index f5b5feb7f5bbc812cc617b299235092e4d057abb..4b4594aa77e2d44792b56e9d7769f5403be3165e 100644 (file)
--- a/gpsbabel/macgpsbabel/MacGPSBabel.applescript
+++ b/gpsbabel/macgpsbabel/MacGPSBabel.applescript
@@ -31,6 +31,35 @@ on will open theObject
        end if
 end will open
 
+on choose menu item theObject
+       if name of theObject is "open" then
+               if visible of window "MacGPSBabel" is true then
+                       if contents of text field "inputFile" of window "MacGPSBabel" is equal to "" then
+                               my selectFile()
+                               return 0
+                       else if the title of current menu item of popup button "inPop" of window "MacGPSBabel" = "Select Input File Type" then
+                               display dialog "Please select an input file type for the previous file before adding another file" buttons {"OK"} default button 1
+                               return 0
+                       else if item 1 of (the last item in fileList) is not equal to (contents of text field "inputFile" of window "MacGPSBabel") then
+                               set the end of fileList to {contents of text field "inputFile" of window "MacGPSBabel", contents of popup button "inPop" of window "MacGPSBabel"}
+                       end if
+                       my addFile()
+               else
+                       set visible of window "MacGPSBabel" to true
+                       if contents of text field "inputFile" of window "MacGPSBabel" is equal to "" then
+                               my selectFile()
+                               return 0
+                       else if the title of current menu item of popup button "inPop" of window "MacGPSBabel" = "Select Input File Type" then
+                               display dialog "Please select an input file type for the previous file before adding another file" buttons {"OK"} default button 1
+                               return 0
+                       else if item 1 of (the last item in fileList) is not equal to (contents of text field "inputFile" of window "MacGPSBabel") then
+                               set the end of fileList to {contents of text field "inputFile" of window "MacGPSBabel", contents of popup button "inPop" of window "MacGPSBabel"}
+                       end if
+                       my addFile()
+               end if
+       end if
+end choose menu item
+
 -- the 'buisness' scripts, for dealing with all button clicks
 on clicked theObject
        -- MAIN WINDOW - Select File button
diff --git a/gpsbabel/macgpsbabel/MacGPSBabel.pbproj/jeremya.pbxuser b/gpsbabel/macgpsbabel/MacGPSBabel.pbproj/jeremya.pbxuser
index 2488ffa89eebd3770c42c83e0edb641b4c08e545..3f87f24816d8da6b45364656594773c1f44c9a2d 100644 (file)
--- a/gpsbabel/macgpsbabel/MacGPSBabel.pbproj/jeremya.pbxuser
+++ b/gpsbabel/macgpsbabel/MacGPSBabel.pbproj/jeremya.pbxuser
@@ -13,7 +13,7 @@
                        DA206CF0015C4D9F03C91932,
                );
                perUserDictionary = {
-                       PBXPerProjectTemplateStateSaveDate = 97476936;
+                       PBXPerProjectTemplateStateSaveDate = 97730381;
                        "PBXTemplateGeometry-F5314676015831810DCA290F" = {
                                ContentSize = "{685, 434}";
                                LeftSlideOut = {
@@ -268,7 +268,7 @@
                                                Split0 = {
                                                        Split0 = {
                                                                NavContent0 = {
-                                                                       bookmark = F5D9F71005CF63CD017C67C1;
+                                                                       bookmark = F528C85D05D3422A017C67C1;
                                                                        history = (
                                                                                F5F16EF60527D1B401A80064,
                                                                                F557060705C8B0C0017C67C1,
@@ -278,7 +278,7 @@
                                                                                F5E2D67F05CDA550017C67C1,
                                                                                F5E2D68005CDA550017C67C1,
                                                                                F5D9F70E05CF63CD017C67C1,
-                                                                               F58F331A05CF5079017C67C1,
+                                                                               F5D9F71005CF63CD017C67C1,
                                                                        );
                                                                        prevStack = (
                                                                                F5F16EF80527D1B401A80064,
@@ -820,7 +820,7 @@
                                        WindowLocation = "{4, 381}";
                                },
                        );
-                       PBXWorkspaceStateSaveDate = 97476936;
+                       PBXWorkspaceStateSaveDate = 97730381;
                };
                perUserProjectItems = {
                        F508F40305A7AE8A01A80064 = F508F40305A7AE8A01A80064;
@@ -834,6 +834,7 @@
                        F51CF6B405AF9E8901A80064 = F51CF6B405AF9E8901A80064;
                        F523D7AD05CB3DB9017C67C1 = F523D7AD05CB3DB9017C67C1;
                        F523D7AE05CB3DB9017C67C1 = F523D7AE05CB3DB9017C67C1;
+                       F528C85D05D3422A017C67C1 = F528C85D05D3422A017C67C1;
                        F52B871705A8A05001A80064 = F52B871705A8A05001A80064;
                        F52B871905A8A05001A80064 = F52B871905A8A05001A80064;
                        F52B871B05A8A05001A80064 = F52B871B05A8A05001A80064;
@@ -871,7 +872,6 @@
                        F586ED1205CC1ED5017C67C1 = F586ED1205CC1ED5017C67C1;
                        F586ED1305CC1ED5017C67C1 = F586ED1305CC1ED5017C67C1;
                        F586ED1405CC1ED5017C67C1 = F586ED1405CC1ED5017C67C1;
-                       F58F331A05CF5079017C67C1 = F58F331A05CF5079017C67C1;
                        F58F331C05CF5079017C67C1 = F58F331C05CF5079017C67C1;
                        F58F331D05CF5079017C67C1 = F58F331D05CF5079017C67C1;
                        F58F331E05CF5079017C67C1 = F58F331E05CF5079017C67C1;
@@ -931,7 +931,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 480";
                rLen = 0;
-               rLoc = 3196;
+               rLoc = 4796;
                rType = 0;
                vrLen = 2445;
                vrLoc = 5977;
@@ -975,7 +975,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 564";
                rLen = 0;
-               rLoc = 23133;
+               rLoc = 24733;
                rType = 0;
                vrLen = 1497;
                vrLoc = 0;
@@ -1015,7 +1015,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 328";
                rLen = 0;
-               rLoc = 13341;
+               rLoc = 14941;
                rType = 0;
                vrLen = 1498;
                vrLoc = 0;
@@ -1024,12 +1024,22 @@
                isa = PBXTargetBookmark;
                trg = 29B97326FDCFA39411CA2CEA;
        };
+       F528C85D05D3422A017C67C1 = {
+               fRef = DA206CF3015C4E8B03C91932;
+               isa = PBXTextBookmark;
+               name = "MacGPSBabel.applescript: 572";
+               rLen = 0;
+               rLoc = 24733;
+               rType = 0;
+               vrLen = 2391;
+               vrLoc = 782;
+       };
        F52B871705A8A05001A80064 = {
                fRef = DA206CF3015C4E8B03C91932;
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 480";
                rLen = 0;
-               rLoc = 3196;
+               rLoc = 4796;
                rType = 0;
                vrLen = 1744;
                vrLoc = 189;
@@ -1039,7 +1049,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 190";
                rLen = 0;
-               rLoc = 3196;
+               rLoc = 4796;
                rType = 0;
                vrLen = 1958;
                vrLoc = 8259;
@@ -1049,7 +1059,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 188";
                rLen = 0;
-               rLoc = 3196;
+               rLoc = 4796;
                rType = 0;
                vrLen = 2222;
                vrLoc = 8371;
@@ -1059,7 +1069,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 434";
                rLen = 0;
-               rLoc = 3196;
+               rLoc = 4796;
                rType = 0;
                vrLen = 1792;
                vrLoc = 0;
@@ -1087,7 +1097,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 434";
                rLen = 0;
-               rLoc = 3196;
+               rLoc = 4796;
                rType = 0;
                vrLen = 1792;
                vrLoc = 0;
@@ -1101,7 +1111,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 193";
                rLen = 0;
-               rLoc = 3196;
+               rLoc = 4796;
                rType = 0;
                vrLen = 1413;
                vrLoc = 2970;
@@ -1125,7 +1135,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 499";
                rLen = 0;
-               rLoc = 3196;
+               rLoc = 4796;
                rType = 0;
                vrLen = 1552;
                vrLoc = 0;
@@ -1149,7 +1159,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 499";
                rLen = 0;
-               rLoc = 3196;
+               rLoc = 4796;
                rType = 0;
                vrLen = 1552;
                vrLoc = 0;
@@ -1173,7 +1183,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 554";
                rLen = 0;
-               rLoc = 23133;
+               rLoc = 24733;
                rType = 0;
                vrLen = 1511;
                vrLoc = 14316;
@@ -1211,7 +1221,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 556";
                rLen = 0;
-               rLoc = 23133;
+               rLoc = 24733;
                rType = 0;
                vrLen = 1495;
                vrLoc = 0;
@@ -1231,7 +1241,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 245";
                rLen = 0;
-               rLoc = 10769;
+               rLoc = 12369;
                rType = 0;
                vrLen = 1811;
                vrLoc = 11141;
@@ -1251,7 +1261,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 245";
                rLen = 0;
-               rLoc = 10769;
+               rLoc = 12369;
                rType = 0;
                vrLen = 1795;
                vrLoc = 11141;
@@ -1271,7 +1281,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 245";
                rLen = 0;
-               rLoc = 10769;
+               rLoc = 12369;
                rType = 0;
                vrLen = 1773;
                vrLoc = 9896;
@@ -1291,7 +1301,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 528";
                rLen = 1109;
-               rLoc = 21317;
+               rLoc = 22917;
                rType = 0;
                vrLen = 2083;
                vrLoc = 20945;
@@ -1311,7 +1321,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 543";
                rLen = 543;
-               rLoc = 22427;
+               rLoc = 24027;
                rType = 0;
                vrLen = 2083;
                vrLoc = 20945;
@@ -1331,25 +1341,15 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 557";
                rLen = 0;
-               rLoc = 23133;
+               rLoc = 24733;
                rType = 0;
-               vrLen = 2221;
+               vrLen = 1436;
                vrLoc = 21697;
        };
        F586ED1405CC1ED5017C67C1 = {
                isa = PBXTargetBookmark;
                trg = 29B97326FDCFA39411CA2CEA;
        };
-       F58F331A05CF5079017C67C1 = {
-               fRef = DA206CF3015C4E8B03C91932;
-               isa = PBXTextBookmark;
-               name = "MacGPSBabel.applescript: 41";
-               rLen = 0;
-               rLoc = 1009;
-               rType = 0;
-               vrLen = 1835;
-               vrLoc = 282;
-       };
        F58F331C05CF5079017C67C1 = {
                fRef = F586ED0005CB576C017C67C1;
                isa = PBXTextBookmark;
@@ -1365,7 +1365,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 577";
                rLen = 0;
-               rLoc = 23133;
+               rLoc = 24733;
                rType = 0;
                vrLen = 1728;
                vrLoc = 16243;
@@ -1385,7 +1385,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 577";
                rLen = 0;
-               rLoc = 23133;
+               rLoc = 24733;
                rType = 0;
                vrLen = 1774;
                vrLoc = 13079;
@@ -1425,7 +1425,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 318";
                rLen = 0;
-               rLoc = 13341;
+               rLoc = 14941;
                rType = 0;
                vrLen = 1766;
                vrLoc = 13015;
@@ -1445,7 +1445,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 41";
                rLen = 0;
-               rLoc = 1009;
+               rLoc = 2609;
                rType = 0;
                vrLen = 1835;
                vrLoc = 282;
@@ -1455,7 +1455,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 556";
                rLen = 0;
-               rLoc = 23133;
+               rLoc = 24733;
                rType = 0;
                vrLen = 1497;
                vrLoc = 0;
@@ -1495,7 +1495,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 543";
                rLen = 0;
-               rLoc = 23133;
+               rLoc = 24733;
                rType = 0;
                vrLen = 1598;
                vrLoc = 13210;
@@ -1526,7 +1526,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 577";
                rLen = 0;
-               rLoc = 23133;
+               rLoc = 24733;
                rType = 0;
                vrLen = 1728;
                vrLoc = 16243;
@@ -1608,7 +1608,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 111";
                rLen = 0;
-               rLoc = 3196;
+               rLoc = 4796;
                rType = 0;
                vrLen = 1256;
                vrLoc = 3068;
Unnamed repository; edit this file 'description' to name the repository.